diff --git a/hosts/default.nix b/hosts/default.nix
index 40e6ae8..31871a1 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,28 +1,35 @@
-{ inputs, ... }:
+{ inputs, withSystem, ... }:
 let
-  inherit (inputs.self) lib;
+  inherit (inputs.self.lib.my) mkSystem;
 in
 {
   flake.nixosConfigurations = {
-    marr = lib.my.mkSystem {
+    marr = mkSystem {
+      inherit withSystem;
       hostname = "marr";
       system = "x86_64-linux";
       extraModules = [ inputs.agenix.nixosModules.default ];
     };
 
-    brontes = lib.my.mkSystem {
+    brontes = mkSystem {
+      inherit withSystem;
       hostname = "brontes";
       system = "x86_64-linux";
       extraModules = [ inputs.agenix.nixosModules.default ];
     };
 
-    styrak = lib.my.mkSystem {
-      hostname = "styrak";
+    shan = mkSystem {
+      inherit withSystem;
+      hostname = "shan";
       system = "x86_64-linux";
-      extraModules = [ inputs.disko.nixosModules.disko ];
+      extraModules = [
+        inputs.disko.nixosModules.disko
+        inputs.agenix.nixosModules.default
+      ];
     };
 
-    raptus = lib.my.mkSystem {
+    raptus = mkSystem {
+      inherit withSystem;
       hostname = "raptus";
       system = "x86_64-linux";
       extraModules = [
diff --git a/parts/lib/functions.nix b/parts/lib/functions.nix
index f4400f4..ad1504f 100644
--- a/parts/lib/functions.nix
+++ b/parts/lib/functions.nix
@@ -17,24 +17,28 @@
 
   mkSystem =
     {
+      withSystem,
       hostname,
       extraModules ? [ ],
       system,
     }:
-    lib.nixosSystem {
-      inherit system;
-      modules = [
-        "${self}/hosts/${hostname}/configuration.nix"
-        "${self}/options"
-        "${self}/options/pulseview.nix"
-        "${self}/options/media.nix"
-        { networking.hostName = hostname; }
-      ] ++ extraModules;
-      specialArgs = {
-        inherit inputs self;
-        username = "ny";
-      };
-    };
+    withSystem system (
+      { inputs', self', ... }:
+      lib.nixosSystem {
+        inherit system;
+        modules = [
+          "${self}/hosts/${hostname}/configuration.nix"
+          "${self}/options"
+          "${self}/modules/commons"
+          { networking.hostName = hostname; }
+        ] ++ extraModules;
+        specialArgs = {
+          inherit inputs inputs';
+          inherit self self';
+          username = "ny";
+        };
+      }
+    );
 
   validatePath =
     s: if (builtins.pathExists s) then (builtins.baseNameOf s) else throw "${s} does not exist";