diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix
index de8b4b9..5985286 100644
--- a/lib/mkmachine.nix
+++ b/lib/mkmachine.nix
@@ -1,22 +1,26 @@
 inputs: lib:
 
 let
-  overlay-unstable = arch: _final: _prev:
-    {
-      unstable = import inputs.unstable { system = arch; };
-    };
+  overlay-unstable = arch: _final: _prev: { unstable = import inputs.unstable { system = arch; }; };
 in
 
-{ name, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }:
-let pkgs = import nixpkgs { inherit system; };
+{
+  name,
+  host-config,
+  modules,
+  nixpkgs ? inputs.nixpkgs,
+  system ? "x86_64-linux",
+  home-manager ? inputs.home-manager,
+}:
+let
+  pkgs = import nixpkgs { inherit system; };
 in
 import "${nixpkgs}/nixos/lib/eval-config.nix" {
   inherit system;
   lib = pkgs.lib.extend (import ./default.nix inputs);
-  specialArgs =
-    {
-      inherit inputs;
-    };
+  specialArgs = {
+    inherit inputs;
+  };
   modules = builtins.attrValues modules ++ [
     ../machines/base.nix
     host-config
@@ -29,33 +33,32 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
     (import "${inputs.buildbot-nix}/nix/worker.nix")
     (import "${inputs.agenix}/modules/age.nix")
     (import inputs.lanzaboote).nixosModules.lanzaboote
+    (import "${inputs.lix-module}/module.nix" { inherit (inputs) lix; })
     {
       home-manager.useGlobalPkgs = true;
+      nixpkgs.system = system;
       networking.hostName = name;
       nixpkgs.overlays = [
         (overlay-unstable system)
-        (_final: prev:
-          {
-            waybar = prev.waybar.overrideAttrs (oldAttrs: {
-              mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-            });
-            # Packages comming from other repositories
-            zotero = pkgs.wrapFirefox (pkgs.callPackage "${inputs.zotero-nix}/pkgs" { }) { };
-            attic = pkgs.callPackage "${inputs.attic}/package.nix" { };
-            colmena = pkgs.callPackage "${inputs.colmena}/package.nix" { };
-            inherit (prev.unstable) bcachefs-tools;
-            # My own packages
-            keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
-            hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
-          })
+        (_final: prev: {
+          waybar = prev.waybar.overrideAttrs (oldAttrs: {
+            mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+          });
+          # Packages comming from other repositories
+          zotero = pkgs.wrapFirefox (pkgs.callPackage "${inputs.zotero-nix}/pkgs" { }) { };
+          attic = pkgs.callPackage "${inputs.attic}/package.nix" { };
+          colmena = pkgs.callPackage "${inputs.colmena}/package.nix" { };
+          inherit (prev.unstable) bcachefs-tools;
+          # My own packages
+          keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
+          hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
+        })
       ];
     }
   ];
   extraModules =
     let
-      colmenaModules = import
-        "${inputs.colmena}/src/nix/hive/options.nix";
+      colmenaModules = import "${inputs.colmena}/src/nix/hive/options.nix";
     in
     [ colmenaModules.deploymentOptions ];
 }
-