diff --git a/flake/default.nix b/flake/default.nix
index 9134085..c73378f 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -69,18 +69,15 @@ let
       };
     };
   };
-
-  systemIndependant = {
-    nixosConfigurations = import ./nixos.nix inputs;
-  };
 in
 flake-parts.lib.mkFlake { inherit inputs; } {
   systems = mySystems;
 
   imports = [
     ./lib.nix
+    ./nixos.nix
     ./overlays.nix
   ];
 
-  flake = (eachMySystem systemDependant) // systemIndependant;
+  flake = (eachMySystem systemDependant);
 }
diff --git a/flake/nixos.nix b/flake/nixos.nix
index 2b117e1..84dce54 100644
--- a/flake/nixos.nix
+++ b/flake/nixos.nix
@@ -1,4 +1,4 @@
-{ self, nixpkgs, nur, ... } @ inputs:
+{ self, inputs, ... }:
 let
   inherit (self) lib;
 
@@ -9,7 +9,7 @@ let
     })
     {
       nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
-        nur.overlay
+        inputs.nur.overlay
       ];
     }
     # Include generic settings
@@ -31,7 +31,9 @@ let
     };
   };
 in
-lib.mapAttrs buildHost {
-  aramis = "x86_64-linux";
-  porthos = "x86_64-linux";
+{
+  flake.nixosConfigurations = lib.mapAttrs buildHost {
+    aramis = "x86_64-linux";
+    porthos = "x86_64-linux";
+  };
 }