diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix
index fc6c465f2..4da48dafd 100644
--- a/lib/build-clan/default.nix
+++ b/lib/build-clan/default.nix
@@ -1,4 +1,4 @@
-{ nixpkgs, lib }:
+{ nixpkgs, clan, lib }:
 { directory  # The directory containing the machines subdirectory
 , specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available
 , machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
@@ -18,6 +18,7 @@ let
     (name: _:
       nixpkgs.lib.nixosSystem {
         modules = [
+          clan.nixosModules.clanCore
           (machineSettings name)
           (machines.${name} or { })
         ];
diff --git a/lib/default.nix b/lib/default.nix
index 066e88eff..89ac0cc3f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,4 @@
-{ lib, nixpkgs, ... }:
+{ lib, clan, nixpkgs, ... }:
 {
   findNixFiles = folder:
     lib.mapAttrs'
@@ -14,5 +14,5 @@
 
   jsonschema = import ./jsonschema { inherit lib; };
 
-  buildClan = import ./build-clan { inherit lib nixpkgs; };
+  buildClan = import ./build-clan { inherit lib clan nixpkgs; };
 }
diff --git a/lib/flake-module.nix b/lib/flake-module.nix
index 64369ec24..13855fbc6 100644
--- a/lib/flake-module.nix
+++ b/lib/flake-module.nix
@@ -7,6 +7,6 @@
   ];
   flake.lib = import ./default.nix {
     inherit lib;
-    inherit (inputs) nixpkgs;
+    inherit (inputs) nixpkgs clan;
   };
 }