diff --git a/flake.nix b/flake.nix
index c198bd3..cc600e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,6 +76,7 @@
       imports = [
         ./parts/formatter.nix
         ./parts/lib.nix
+        ./parts/fleet-option.nix
         ./parts/nixos-configurations.nix
         ./parts/nixos-modules.nix
         ./parts/packages.nix
diff --git a/parts/fleet-option.nix b/parts/fleet-option.nix
new file mode 100644
index 0000000..96c5a56
--- /dev/null
+++ b/parts/fleet-option.nix
@@ -0,0 +1,9 @@
+# Flake-parts wrapper for fleet-option.nix
+{ inputs, self, lib, config, ... }:
+let
+  fleetModule = import ../fleet/fleet-option.nix { inherit inputs lib; };
+  inventoryModule = import ../inventory.nix { };
+in
+{
+  imports = [ fleetModule inventoryModule ];
+}
diff --git a/parts/nixos-configurations.nix b/parts/nixos-configurations.nix
index dcf2ce2..5729ab5 100644
--- a/parts/nixos-configurations.nix
+++ b/parts/nixos-configurations.nix
@@ -1,12 +1,9 @@
 # NixOS configurations generated from fleet
-{ inputs, self, lib, pkgs, config, ... }:
+{ inputs, self, lib, config, ... }:
 {
-  imports = [
-    (import ../fleet/fleet-option.nix { inherit inputs lib pkgs config; })
-  ];
   flake.nixosConfigurations =
     let
-      fleet = self.lib.mkFleet { inherit inputs lib pkgs config; };
+      fleet = self.lib.mkFleet { inherit inputs lib config; };
     in
     fleet.nixosConfigurations;
 }
diff --git a/parts/users.nix b/parts/users.nix
new file mode 100644
index 0000000..9e88f48
--- /dev/null
+++ b/parts/users.nix
@@ -0,0 +1,7 @@
+# Flake-parts wrapper for users.nix
+{ inputs, ... }:
+let
+  # Minimal pkgs just for shell paths - will be overridden in actual NixOS configs
+  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+in
+import ../users.nix { inherit pkgs; }