diff --git a/common/default.nix b/common/default.nix
index de060697..32d240af 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -29,6 +29,8 @@
   };
 
   nix = {
+    package = pkgs.nixVersions.nix_2_23;
+
     # Edit nix.conf
     settings = {
       # Store
diff --git a/devices/servivi/modules/binary-cache.nix b/devices/servivi/modules/binary-cache.nix
index 52a76937..500e0bbf 100644
--- a/devices/servivi/modules/binary-cache.nix
+++ b/devices/servivi/modules/binary-cache.nix
@@ -9,7 +9,9 @@
 
   nix-fast-buildPkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
     nix-eval-jobs =
-      pkgs.nix-eval-jobs
+      pkgs.nix-eval-jobs.override {
+        nix = config.nix.package;
+      }
       // {
         nix = config.nix.package;
       };
diff --git a/flake.lock b/flake.lock
index a556c3ac..c9c64dac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -448,24 +448,6 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_8"
-      },
-      "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"
-      }
-    },
     "flakegen": {
       "inputs": {
         "systems": "systems_2"
@@ -484,21 +466,6 @@
         "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"
-      }
-    },
     "git-theme-src": {
       "flake": false,
       "locked": {
@@ -949,7 +916,7 @@
     },
     "lib-aggregate": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "nixpkgs-lib": "nixpkgs-lib_4"
       },
       "locked": {
@@ -982,43 +949,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1718767907,
-        "narHash": "sha256-gpd+mGQxqVHw2kO6rSPQel8TkChHh9UpqxjsmQi0QJM=",
-        "rev": "85f282ef572577899b3d80ba8def1b920a386218",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/85f282ef572577899b3d80ba8def1b920a386218.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1720695775,
-        "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=",
-        "ref": "refs/heads/main",
-        "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a",
-        "revCount": 94,
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      }
-    },
     "minix": {
       "inputs": {
         "curseforge-server-downloader-src": "curseforge-server-downloader-src",
@@ -1058,7 +988,7 @@
     },
     "mozilla-addons-to-nix": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -1491,16 +1421,16 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1721524707,
-        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
+        "lastModified": 1715458492,
+        "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
+        "rev": "8e47858badee5594292921c2668c11004c3b0142",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-24.05",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1775,7 +1705,6 @@
         "jovian": "jovian",
         "khepri": "khepri",
         "libratbag-src": "libratbag-src",
-        "lix-module": "lix-module",
         "minix": "minix",
         "modernx-src": "modernx-src",
         "mozilla-addons-to-nix": "mozilla-addons-to-nix",
@@ -1831,11 +1760,11 @@
         "sops-nix": "sops-nix"
       },
       "locked": {
-        "lastModified": 1721855861,
-        "narHash": "sha256-rVCnb7CGsiifat9s1xc6MkYu/ossB8pT7f0hHszCxyg=",
+        "lastModified": 1716069733,
+        "narHash": "sha256-80esrChLmwUiWa/j7oJ8JwSW+6k2IMTjiRLTA0cNfJg=",
         "ref": "refs/heads/main",
-        "rev": "7ef3e9364c7b1a3fef1e98bf9dcb3847e44bac9e",
-        "revCount": 67,
+        "rev": "1750659f6783859f22ee02b0fa1987fe4809229c",
+        "revCount": 66,
         "type": "git",
         "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
       },
@@ -1869,11 +1798,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1721688883,
-        "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
+        "lastModified": 1715482972,
+        "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
+        "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
         "type": "github"
       },
       "original": {
@@ -2048,21 +1977,6 @@
         "type": "github"
       }
     },
-    "systems_8": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "trash-d-src": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 2ff13720..9f7a9eb2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -152,11 +152,6 @@
       repo = "libratbag";
       type = "github";
     };
-    lix-module = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      type = "git";
-      url = "https://git.lix.systems/lix-project/nixos-module";
-    };
     minix = {
       inputs.nixpkgs.follows = "nixpkgs";
       owner = "matt1432";
diff --git a/flake/inputs.nix b/flake/inputs.nix
index b4889382..7e85c4fd 100644
--- a/flake/inputs.nix
+++ b/flake/inputs.nix
@@ -9,11 +9,6 @@ let
 
   # Inputs
   nixTools = {
-    lix-module = mkDep {
-      type = "git";
-      url = "https://git.lix.systems/lix-project/nixos-module";
-    };
-
     nix-fast-build = mkDep {
       owner = "Mic92";
       repo = "nix-fast-build";
diff --git a/flake/lib.nix b/flake/lib.nix
index 232f65ce..95b66bfd 100644
--- a/flake/lib.nix
+++ b/flake/lib.nix
@@ -16,7 +16,6 @@
         "discord-overlay"
         "grim-hyprland"
         "jovian"
-        "lix-module"
         "nixpkgs-wayland"
       ];
     };