diff --git a/hosts/default.nix b/hosts/default.nix
index ee6b031..f0e8904 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -4,28 +4,20 @@
 }: let
     inherit (inputs) self;
     inherit (self) lib;
-in {
-    niks = lib.nixosSystem {
-        system = null;
-        specialArgs = {
-            inherit lib inputs self;
-        };
-        modules = [
-            ./niks
-            ../modules
-        ];
-    };
 
-    del = lib.nixosSystem {
+    createSystem = systemDir: lib.nixosSystem {
         system = null;
-        specialArgs = {
-            inherit lib inputs self;
-        };
+        specialArgs = {inherit lib inputs self;};
         modules = [
-            ./del
+            systemDir
             ../modules
         ];
     };
+in {
+
+    niks = createSystem ./niks;
+
+    del = createSystem ./del;
 
     #hape = lib.nixosSystem {
     #    system = "x86_64-linux";
@@ -38,14 +30,6 @@ in {
     #        inputs.home-manager.nixosModules.home-manager
     #    ];
     #};
-    chmura = lib.nixosSystem {
-        system = null;
-        specialArgs = {
-            inherit lib inputs self;
-        };
-        modules = [
-            ./chmura
-            ../modules
-        ];
-    };
+
+    chmura = createSystem ./chmura;
 }