diff --git a/demo/homeassistant/flake.nix b/demo/homeassistant/flake.nix
index 6e9cf4b..cbcee59 100644
--- a/demo/homeassistant/flake.nix
+++ b/demo/homeassistant/flake.nix
@@ -19,13 +19,11 @@
       basic =
         { config, ... }:
         {
-          nixpkgs.overlays = [
-            selfhostblocks.overlays.${system}.default
-          ];
           imports = [
             ./configuration.nix
             selfhostblocks.nixosModules.authelia
             selfhostblocks.nixosModules.home-assistant
+            selfhostblocks.nixosModules.overlay
             selfhostblocks.nixosModules.sops
             selfhostblocks.nixosModules.ssl
             sops-nix.nixosModules.default
diff --git a/demo/minimal/flake.nix b/demo/minimal/flake.nix
index 5bc7371..3eff276 100644
--- a/demo/minimal/flake.nix
+++ b/demo/minimal/flake.nix
@@ -36,11 +36,6 @@
             modules = [
               selfhostblocks.nixosModules.default
               filesystemModule
-              {
-                nixpkgs.overlays = [
-                  selfhostblocks.overlays.${system}.default
-                ];
-              }
               # This modules showcases the use of SHB's lib.
               (
                 {
@@ -75,11 +70,6 @@
               selfhostblocks.nixosModules.sops
               sops-nix.nixosModules.default
               filesystemModule
-              {
-                nixpkgs.overlays = [
-                  selfhostblocks.overlays.${system}.default
-                ];
-              }
               # This modules showcases the use of SHB's lib.
               (
                 {
@@ -120,11 +110,6 @@
               modules = [
                 selfhostblocks.nixosModules.default
                 filesystemModule
-                {
-                  nixpkgs.overlays = [
-                    selfhostblocks.overlays.${system}.default
-                  ];
-                }
                 # This modules showcases the use of SHB's lib.
                 (
                   {
@@ -173,11 +158,6 @@
               modules = [
                 selfhostblocks.nixosModules.default
                 filesystemModule
-                {
-                  nixpkgs.overlays = [
-                    selfhostblocks.overlays.${system}.default
-                  ];
-                }
                 # This modules showcases the use of SHB's lib.
                 (
                   {
diff --git a/demo/nextcloud/flake.nix b/demo/nextcloud/flake.nix
index ff5b24b..9d2042a 100644
--- a/demo/nextcloud/flake.nix
+++ b/demo/nextcloud/flake.nix
@@ -24,6 +24,7 @@
             selfhostblocks.nixosModules.authelia
             selfhostblocks.nixosModules.nextcloud-server
             selfhostblocks.nixosModules.nginx
+            selfhostblocks.nixosModules.overlay
             selfhostblocks.nixosModules.sops
             selfhostblocks.nixosModules.ssl
             sops-nix.nixosModules.default
diff --git a/flake.nix b/flake.nix
index 75ef4a1..01b0192 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,7 @@
           inherit system;
           config.allowUnfree = true;
           overlays = [
-            self.overlays.${system}.default
+            self.overlays.default
           ];
         };
 
@@ -217,21 +217,6 @@
           inherit patchNixpkgs patchedNixpkgs;
         };
 
-        overlays.default = final: prev: {
-          # shb = self.nixosModules.lib;
-          prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs {
-            src = pkgs.fetchFromGitHub {
-              owner = "ibizaman";
-              repo = prev.prometheus-systemd-exporter.pname;
-              # rev = "v${prev.prometheus-systemd-exporter.version}";
-              rev = "next_timer";
-              sha256 = "sha256-jzkh/616tsJbNxFtZ0xbdBQc16TMIYr9QOkPaeQw8xA=";
-            };
-
-            vendorHash = "sha256-4hsQ1417jLNOAqGkfCkzrmEtYR4YLLW2j0CiJtPg6GI=";
-          };
-        };
-
         checks =
           let
             inherit (pkgs.lib)
@@ -385,6 +370,13 @@
 
       nixosModules.default = {
         imports = [
+          # We cannot use self.nixosModules.overlay otherwise it leeds to infinite recursion.
+          {
+            nixpkgs.overlays = [
+              self.overlays.default
+            ];
+          }
+
           # blocks
           self.nixosModules.authelia
           self.nixosModules.borgbackup
@@ -420,6 +412,11 @@
         ];
       };
 
+      nixosModules.overlay = {
+        nixpkgs.overlays = [
+          self.overlays.default
+        ];
+      };
       nixosModules.lib = lib/module.nix;
 
       nixosModules.authelia = modules/blocks/authelia.nix;
@@ -453,5 +450,20 @@
       nixosModules.paperless = modules/services/paperless.nix;
       nixosModules.pinchflat = modules/services/pinchflat.nix;
       nixosModules.vaultwarden = modules/services/vaultwarden.nix;
+
+      overlays.default = final: prev: {
+        # shb = self.nixosModules.lib;
+        prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs {
+          src = final.fetchFromGitHub {
+            owner = "ibizaman";
+            repo = prev.prometheus-systemd-exporter.pname;
+            # rev = "v${prev.prometheus-systemd-exporter.version}";
+            rev = "next_timer";
+            sha256 = "sha256-jzkh/616tsJbNxFtZ0xbdBQc16TMIYr9QOkPaeQw8xA=";
+          };
+
+          vendorHash = "sha256-4hsQ1417jLNOAqGkfCkzrmEtYR4YLLW2j0CiJtPg6GI=";
+        };
+      };
     };
 }