diff --git a/flake.lock b/flake.lock
index 7645a64..f29131d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -277,21 +277,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"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -432,43 +417,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1746827285,
-        "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
-        "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746838955,
-        "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
-        "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
-      }
-    },
     "lspkind-nvim": {
       "flake": false,
       "locked": {
@@ -845,7 +793,6 @@
         "home-manager": "home-manager",
         "language-servers": "language-servers",
         "lanzaboote": "lanzaboote",
-        "lix-module": "lix-module",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nvim-plugins": "nvim-plugins",
diff --git a/flake.nix b/flake.nix
index 1261db1..0f8e3cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,14 +7,6 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
-
     apple-silicon = {
       url = "github:kitten/nixos-apple-silicon/edge";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -98,7 +90,7 @@
     eachSystem = lib.genAttrs ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"];
     overlays = [
       self.overlays.default
-      inputs.lix-module.overlays.default
+      self.overlays.lix
       inputs.nvim-plugins.overlays.default
       inputs.android-sdk.overlays.default
       inputs.language-servers.overlays.default
@@ -146,12 +138,13 @@
 
     overlays = {
       default = import ./lib/pkgs;
+      lix = import ./lib/lix-overlay.nix;
     };
 
     packages = eachSystem (system: let
       pkgs = import inputs.nixpkgs {
         inherit system;
-        overlays = [ self.overlays.default ];
+        overlays = [ self.overlays.default self.overlays.lix ];
       };
     in {
       inherit (inputs.agenix.packages.${system}) agenix;
diff --git a/lib/lix-overlay.nix b/lib/lix-overlay.nix
new file mode 100644
index 0000000..1c2f58d
--- /dev/null
+++ b/lib/lix-overlay.nix
@@ -0,0 +1,9 @@
+self: super:
+
+let
+  lixPackageSets = self.lixPackageSets.override {
+    inherit (super) nix-direnv nix-fast-build;
+  };
+in {
+  inherit (lixPackageSets.latest) lix nix-direnv nix-eval-jobs nix-fast-build;
+}
diff --git a/modules/base/nix-config.nix b/modules/base/nix-config.nix
index b524adc..283ff3e 100644
--- a/modules/base/nix-config.nix
+++ b/modules/base/nix-config.nix
@@ -5,7 +5,7 @@ with lib; mkMerge [
     age.secrets."nix-access-tokens.conf".file = ./encrypt/nix-access-tokens.conf.age;
 
     nix = {
-      package = pkgs.nix;
+      package = pkgs.lix;
       channel.enable = mkForce false;
 
       # make flake registry and nix path match flake inputs