diff --git a/flake.lock b/flake.lock
index 2a16eb8..5aac466 100644
--- a/flake.lock
+++ b/flake.lock
@@ -389,6 +389,39 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "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-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_3",
@@ -648,6 +681,41 @@
         "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_2",
+        "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"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
+      }
+    },
     "master": {
       "locked": {
         "lastModified": 1747512611,
@@ -1086,7 +1154,7 @@
           "nixpkgs"
         ],
         "nuschtosSearch": "nuschtosSearch",
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1747449013,
@@ -1124,7 +1192,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -1176,6 +1244,7 @@
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "jovian": "jovian",
+        "lix-module": "lix-module",
         "master": "master",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "niri": "niri",
@@ -1320,6 +1389,21 @@
         "type": "github"
       }
     },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "timers": {
       "inputs": {
         "naersk": "naersk",
@@ -1405,7 +1489,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1692799911,
diff --git a/flake.nix b/flake.nix
index 8f324d1..1ca1f8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,9 @@
       inputs.flake-parts.follows = "flake-parts";
     };
 
+    lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
+    lix-module.inputs.nixpkgs.follows = "nixpkgs";
+
     nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
     nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
 
diff --git a/machines/moritz-server/configuration.nix b/machines/moritz-server/configuration.nix
index 57a1055..f5b8ca1 100644
--- a/machines/moritz-server/configuration.nix
+++ b/machines/moritz-server/configuration.nix
@@ -1,4 +1,4 @@
-{
+{inputs, ...}: {
   imports = [
     ../../modules/zfs_unencrypted.nix
     ../../modules/shared.nix
@@ -7,6 +7,7 @@
     ./ddns.nix
     ./mail-server.nix
     ./website/root
+    inputs.lix-module.nixosModules.default
   ];
 
   time.timeZone = "Europe/Berlin";
diff --git a/modules/moritz/programs/nix.nix b/modules/moritz/programs/nix.nix
index d00dfd1..ca8134f 100644
--- a/modules/moritz/programs/nix.nix
+++ b/modules/moritz/programs/nix.nix
@@ -2,14 +2,16 @@
   config,
   lib,
   inputs,
-  self,
-  pkgs,
   ...
 }: let
   inherit (lib) mkEnableOption mkOption types;
 
   cfg = config.my.programs.nix;
 in {
+  imports = [
+    inputs.lix-module.nixosModules.default
+  ];
+
   options.my.programs.nix = {
     gc = {
       enable = mkEnableOption "nix-gc";
@@ -23,15 +25,9 @@ in {
   };
 
   config = {
-    home-manager.users.moritz.programs.direnv.nix-direnv.package = pkgs.nix-direnv.override {
-      nix = config.nix.package;
-    };
-
     nix = {
       nixPath = ["nixpkgs=${inputs.nixpkgs}"];
 
-      package = pkgs.nix; # TODO: change this back
-
       extraOptions = ''
         experimental-features = nix-command flakes
       '';
@@ -56,9 +52,6 @@ in {
         master.flake = inputs.master;
         nixpkgs.flake = inputs.nixpkgs;
         stable.flake = inputs.stable;
-        dotfiles.flake = self;
-        default.flake = self;
-        d.flake = self;
       };
 
       settings = {