diff --git a/flake.lock b/flake.lock
index e980db7..8a95fce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -101,39 +101,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "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"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -189,41 +156,6 @@
         "url": "https://git.dadada.li/dadada/dadada.li/archive/main.tar.gz"
       }
     },
-    "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?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1736643958,
@@ -316,12 +248,11 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager_2",
         "homepage": "homepage",
-        "lix-module": "lix-module",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-small": "nixpkgs-small",
-        "systems": "systems_2",
+        "systems": "systems",
         "treefmt-nix": "treefmt-nix"
       }
     },
@@ -340,21 +271,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "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": [
diff --git a/flake.nix b/flake.nix
index ec49fa2..05f7349 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,10 +25,6 @@
       url = "github:numtide/devshell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 497a7bf..adacb51 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -3,7 +3,6 @@
   agenix,
   home-manager,
   homepage,
-  lix-module,
   nixos-hardware,
   nixos-generators,
   nixpkgs,
@@ -11,8 +10,6 @@
   ...
 }@inputs:
 let
-  lixModule = lix-module.nixosModules.default;
-
   nixosSystem =
     {
       nixpkgs,
@@ -24,7 +21,6 @@ let
 
       modules =
         [
-          lixModule
           {
             nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
           }
@@ -35,38 +31,40 @@ let
     };
 in
 {
-  gorgon = nixosSystem rec {
-    nixpkgs = nixpkgs;
+  gorgon =
+    let
+      system = "x86_64-linux";
+    in
+    nixosSystem {
+      inherit nixpkgs system;
 
-    system = "x86_64-linux";
-
-    extraModules = [
-      {
-        nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
-        dadada.pkgs = self.packages.${system};
-        dadada.inputs = inputs // {
-          dadada = self;
-        };
-      }
-
-      nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
-
-      home-manager.nixosModules.home-manager
-      (
-        { pkgs, lib, ... }:
+      extraModules = [
         {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [
-            { dadada.home.helix.package = pkgs.helix; }
-            { manual.manpages.enable = false; }
-          ];
-          home-manager.users.dadada = import ../home;
+          nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
+          dadada.pkgs = self.packages.${system};
+          dadada.inputs = inputs // {
+            dadada = self;
+          };
         }
-      )
-      ./gorgon/configuration.nix
-    ];
-  };
+
+        nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
+
+        home-manager.nixosModules.home-manager
+        (
+          { pkgs, lib, ... }:
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [
+              { dadada.home.helix.package = pkgs.helix; }
+              { manual.manpages.enable = false; }
+            ];
+            home-manager.users.dadada = import ../home;
+          }
+        )
+        ./gorgon/configuration.nix
+      ];
+    };
 
   surgat = nixosSystem {
     nixpkgs = nixpkgs-small;
@@ -94,7 +92,6 @@ in
     nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        lixModule
         nixos-generators.nixosModules.install-iso
         self.nixosModules.admin
         {
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index e375cc9..c23a273 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 let
   mkDefault = lib.mkDefault;
   inputs = config.dadada.inputs;
@@ -22,6 +22,8 @@ in
 
   time.timeZone = mkDefault "Europe/Berlin";
 
+  nix.package = pkgs.lix;
+
   nix.settings.substituters = [ https://cache.nixos.org/ ];
 
   nix.settings.trusted-public-keys = [