diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix
index 593b19e..c396e02 100644
--- a/modules/nixos/core/nix.nix
+++ b/modules/nixos/core/nix.nix
@@ -2,9 +2,9 @@
 
 let
   importOverlays = builtins.map
-    (overlay: overlay { inherit lib inputs; })
+    (overlay: import overlay { inherit lib inputs; })
     (builtins.filter 
-      (file: builtins.match "(.*.nix)" (builtins.toString file) != [])
+      (file: builtins.match ".*\.nix" (builtins.toString file) != null)
       (lib.filesystem.listFilesRecursive ../../../overlays));
 in {
   nix = {
diff --git a/overlays/nixpkgs-unstable.nix b/overlays/nixpkgs-unstable.nix
index 1a0c1d6..96d7851 100644
--- a/overlays/nixpkgs-unstable.nix
+++ b/overlays/nixpkgs-unstable.nix
@@ -2,3 +2,4 @@
 (final: prev: {
   unstable = inputs.nixpkgs-unstable.legacyPackages.${prev.system};
 })
+(builtins.filter (file: builtins.match "(.*.nix)" (builtins.toString file) != null) (lib.filesystem.listFilesRecursive ./.))