Remove mkHost helper

flake.nix

@@ -6,23 +6,29 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
-  outputs = { nixpkgs, ... }@inputs: 
-  let
-    utils = import ./lib { inherit inputs; };
-    inherit (utils) mkHost;
-  in {
+  outputs = { nixpkgs, ... }@inputs: {
     nixosConfigurations = {
-      marauder = mkHost {
-        hostName = "marauder";
+      marauder = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        timeZone = "America/Los_Angeles";
-        stateVersion = "24.05";
+        modules = [
+          ./hosts/marauder
+          ./common.nix
+        ];
+        specialArgs = {
+          hostName = "marauder";
+          inherit inputs;
+        };
       };
-      monolith = mkHost {
-        hostName = "monolith";
+      monolith = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        timeZone = "America/Los_Angeles";
-        stateVersion = "24.05";
+        modules = [
+          ./hosts/monolith
+          ./common.nix
+        ];
+        specialArgs = {
+          hostName = "monolith";
+          inherit inputs;
+        };
       };
     };
   };