diff --git a/flakeModules/clan.nix b/flakeModules/clan.nix
index 2bd595b34..36730d55b 100644
--- a/flakeModules/clan.nix
+++ b/flakeModules/clan.nix
@@ -3,7 +3,6 @@ clan-core:
   config,
   lib,
   self,
-  inputs,
   ...
 }:
 let
@@ -29,10 +28,7 @@ in
       default = { };
       type = types.submoduleWith {
         specialArgs = {
-          inherit clan-core self;
-          inherit (inputs) nixpkgs nix-darwin;
-          # TODO: inject the inventory interface
-          # inventoryInterface = {};
+          inherit self;
         };
         modules = [
           clan-core.modules.clan.default
diff --git a/flakeModules/flake-module.nix b/flakeModules/flake-module.nix
index bd840e510..b3aab6525 100644
--- a/flakeModules/flake-module.nix
+++ b/flakeModules/flake-module.nix
@@ -1,7 +1,7 @@
 { self, config, ... }:
 {
   flake.flakeModules = {
-    clan = import ./clan.nix self;
+    clan = import ./clan.nix self.module.clan.default;
     default = config.flake.flakeModules.clan;
   };
 }
diff --git a/lib/default.nix b/lib/default.nix
index 6748173bb..22d9f52ff 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,8 +1,6 @@
 {
   lib,
   self,
-  nixpkgs,
-  nix-darwin ? null,
   ...
 }:
 # Produces the
@@ -14,7 +12,6 @@ lib.fix (
     buildClanLib = (
       clanLib.callLib ./modules {
         clan-core = self;
-        inherit nixpkgs nix-darwin;
       }
     );
   in
diff --git a/lib/flake-module.nix b/lib/flake-module.nix
index 9cf0bb96f..08497656a 100644
--- a/lib/flake-module.nix
+++ b/lib/flake-module.nix
@@ -16,7 +16,6 @@ rec {
   ];
   flake.clanLib = import ./default.nix {
     inherit lib inputs self;
-    inherit (inputs) nixpkgs nix-darwin;
   };
   # TODO: remove this legacy alias
   flake.lib = flake.clanLib;
diff --git a/lib/modules/clan/default.nix b/lib/modules/clan/default.nix
index af742cbcc..51a1e37b5 100644
--- a/lib/modules/clan/default.nix
+++ b/lib/modules/clan/default.nix
@@ -4,6 +4,8 @@
   _module.args = {
     inherit clan-core;
     inherit (clan-core) clanLib;
+    # TODO: This should be set via an option otherwise it is not possible to override
+    inherit (clan-core.inputs) nixpkgs nix-darwin;
   };
   imports = [
     ./module.nix
diff --git a/lib/modules/default.nix b/lib/modules/default.nix
index 2600fab0e..d9bd27ce2 100644
--- a/lib/modules/default.nix
+++ b/lib/modules/default.nix
@@ -2,10 +2,8 @@
 ## This is only a wrapper such that 'clan' can be called as a function.
 {
   lib,
-  clanLib,
   clan-core,
-  nixpkgs,
-  nix-darwin,
+  ...
 }:
 rec {
   buildClan =
@@ -18,12 +16,8 @@ rec {
     }@m:
     lib.evalModules {
       specialArgs = {
-        inherit (clan-core) clanLib;
         inherit
           self
-          clan-core
-          nixpkgs
-          nix-darwin
           ;
       };
       modules = [