diff --git a/flake.lock b/flake.lock
index e7545b99..b69b3af4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -111,6 +111,24 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "locked": {
         "lastModified": 1653893745,
         "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@@ -125,9 +143,9 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "flake-utils_3": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1705309234,
@@ -143,6 +161,21 @@
         "type": "github"
       }
     },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -187,6 +220,41 @@
         "url": "https://git.pub.solar/teutat3s/invoiceplane-templates.git"
       }
     },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723503926,
+        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
+        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "flakey-profile": "flakey-profile",
+        "lix": "lix",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723510904,
+        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
+        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -290,6 +358,7 @@
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "invoiceplane-template": "invoiceplane-template",
+        "lix-module": "lix-module",
         "nix-darwin": "nix-darwin",
         "nixos-22-05": "nixos-22-05",
         "nixos-flake": "nixos-flake",
@@ -346,6 +415,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -369,7 +453,7 @@
     },
     "triton-vmtools": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -394,7 +478,7 @@
     "tritonshell": {
       "inputs": {
         "devshell": "devshell",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index 1527112f..c150028a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,8 +9,6 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    #fork.url = "github:teutat3s/nixpkgs/fix-element-desktop-screen-sharing";
-
     flake-compat.url = "github:edolstra/flake-compat";
     flake-compat.flake = false;
 
@@ -34,6 +32,11 @@
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     invoiceplane-template.url = "git+https://git.pub.solar/teutat3s/invoiceplane-templates.git";
     invoiceplane-template.inputs.nixpkgs.follows = "nixpkgs";
     invoiceplane-template.inputs.flake-parts.follows = "flake-parts";
diff --git a/modules/default.nix b/modules/default.nix
index e974d84e..7dc2ea0a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -28,6 +28,7 @@
       base.imports = [
         self.nixosModules.home-manager
         inputs.agenix.nixosModules.default
+        inputs.lix-module.nixosModules.default
 
         self.nixosModules.overlays
         self.nixosModules.core
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 264b8c34..7d4d9494 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -31,7 +31,8 @@
 
   nix = {
     # Use lix (forked nix)
-    package = pkgs.lix;
+    # now set globally using lix-module
+    #package = pkgs.lix;
     gc.automatic = true;
     optimise.automatic = true;
 
diff --git a/overlays/default.nix b/overlays/default.nix
index 27b81688..f05bce84 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -20,7 +20,6 @@
             };
           in
           {
-            #element-desktop = fork.element-desktop;
             neovim-unwrapped = unstable.neovim-unwrapped;
             vimPlugins = unstable.vimPlugins;
             #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};