diff --git a/configuration/common/default.nix b/configuration/common/default.nix
index d3f068d..a054e1c 100644
--- a/configuration/common/default.nix
+++ b/configuration/common/default.nix
@@ -2,8 +2,6 @@
 
 {
   imports = [
-    ../../modules
-
     ./backup.nix
     ./locale.nix
     ./networking.nix
diff --git a/flake.nix b/flake.nix
index 7c178b5..82ccf23 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,6 +92,11 @@
 
     nixosConfigurations = helper.mapToNixosConfigurations self.clerie.hosts;
 
+    nixosModules = {
+      clerie = import ./modules;
+      default = self.nixosModules.clerie;
+    };
+
     overlays = {
       nixfilesInputs = import ./flake/overlay.nix inputs;
       clerie = import ./pkgs/overlay.nix;
diff --git a/lib/flake-helper.nix b/lib/flake-helper.nix
index 146b889..8fd9dc3 100644
--- a/lib/flake-helper.nix
+++ b/lib/flake-helper.nix
@@ -11,6 +11,7 @@ rec {
   in localNixpkgs.lib.nixosSystem {
     system = system;
     modules = modules ++ [
+      self.nixosModules.clerie
       ({ ... }: {
         /*
           Make the contents of the flake availiable to modules.