diff --git a/flake/config.nix b/flake/config.nix
index 823d52a..1f8b1a5 100644
--- a/flake/config.nix
+++ b/flake/config.nix
@@ -26,9 +26,6 @@
         (import ./overlays/jetbrains.nix {inherit inputs;})
         (import ./overlays/marleyvim.nix {inherit inputs;})
         (import ./overlays/wezterm.nix {inherit inputs;})
-
-        # Custom packages
-        (import ./overlays/marleyos.nix)
       ];
     };
   };
diff --git a/modules/base/nix.nix b/modules/base/nix.nix
index e947cc8..e7a287e 100644
--- a/modules/base/nix.nix
+++ b/modules/base/nix.nix
@@ -57,6 +57,9 @@
 
       overlays = [
         inputs.nur.overlays.default
+
+        # Custom packages
+        (import ../../overlays/marleyos.nix)
       ];
     };
 
diff --git a/overlays/marleyos.nix b/overlays/marleyos.nix
index 53a6fc0..9884dae 100644
--- a/overlays/marleyos.nix
+++ b/overlays/marleyos.nix
@@ -1,6 +1,6 @@
 _: prev: {
   marleyos =
-    prev.marleyos
+    (prev.marleyos or {})
     // {
       CEmu-TI-84-Plus-CE = prev.callPackage ../packages/CEmu-TI-84-Plus-CE {};
       figlet-xero-fonts = prev.callPackage ../packages/figlet-xero-fonts {};