diff --git a/flake.nix b/flake.nix
index 064fd0c..0ea01ec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
     inputs = {
         nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
         nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+        nixpkgs-mongodb-fix.url = "github:bryanasdev000/nixpkgs/mongodb-fixes";
         home-manager.url = "github:nix-community/home-manager/release-22.05";
         nurpkgs.url = "github:nix-community/NUR";
         comma.url = "github:nix-community/comma";
diff --git a/src/apps/system/mongo.nix b/src/apps/system/mongo.nix
new file mode 100644
index 0000000..e95f8b5
--- /dev/null
+++ b/src/apps/system/mongo.nix
@@ -0,0 +1,7 @@
+{ nixpkgs-mongodb-fix, ... }: {
+  services.mongodb = {
+    package = (import nixpkgs-mongodb-fix { inherit system; config = { allowUnfree = true; }; }).mongodb-4_4;
+    enable = true;
+    dbpath = "/tmp/mongodb";
+  };
+}
diff --git a/src/home.nix b/src/home.nix
index 34651be..bbe32c3 100644
--- a/src/home.nix
+++ b/src/home.nix
@@ -3,8 +3,8 @@
     variables = import ./common/variables.nix;
     personalPackages = import ./utils/nixFilesIn.nix lib ./apps/personal;
     personalScripts = import ./utils/nixFilesIn.nix lib ./scripts/personal;
-    overlays = import ./utils/nixFilesIn.nix lib ./apps/personal/overlays;
-    packages = import ./utils/nixFilesIn.nix lib ./apps/personal/packages;
+    overlays = import ./utils/nixFilesIn.nix lib ./overlays;
+    packages = import ./utils/nixFilesIn.nix lib ./packages;
 in {
     imports = personalPackages ++ personalScripts;
 
diff --git a/src/apps/personal/overlays/anytype.nix b/src/overlays/anytype.nix
similarity index 100%
rename from src/apps/personal/overlays/anytype.nix
rename to src/overlays/anytype.nix
diff --git a/src/apps/personal/overlays/electron-screenshare.nix b/src/overlays/electron-screenshare.nix
similarity index 100%
rename from src/apps/personal/overlays/electron-screenshare.nix
rename to src/overlays/electron-screenshare.nix
diff --git a/src/apps/personal/overlays/hollywood.nix b/src/overlays/hollywood.nix
similarity index 100%
rename from src/apps/personal/overlays/hollywood.nix
rename to src/overlays/hollywood.nix
diff --git a/src/apps/personal/overlays/hubfs.nix b/src/overlays/hubfs.nix
similarity index 100%
rename from src/apps/personal/overlays/hubfs.nix
rename to src/overlays/hubfs.nix
diff --git a/src/apps/personal/overlays/maintainers.nix b/src/overlays/maintainers.nix
similarity index 100%
rename from src/apps/personal/overlays/maintainers.nix
rename to src/overlays/maintainers.nix
diff --git a/src/apps/personal/packages/figma-linux.nix b/src/packages/figma-linux.nix
similarity index 100%
rename from src/apps/personal/packages/figma-linux.nix
rename to src/packages/figma-linux.nix
diff --git a/src/apps/personal/packages/oneshot-game.nix b/src/packages/oneshot-game.nix
similarity index 100%
rename from src/apps/personal/packages/oneshot-game.nix
rename to src/packages/oneshot-game.nix
diff --git a/src/system.nix b/src/system.nix
index 01450de..950f89c 100644
--- a/src/system.nix
+++ b/src/system.nix
@@ -1,7 +1,9 @@
-{ pkgs, lib, modulesPath, config, ... }:
+{ pkgs, nurpkgs, lib, modulesPath, config, ... }:
 let
     nixScripts = import ./utils/nixFilesIn.nix lib ./nix/system;
     nixApps = import ./utils/nixFilesIn.nix lib ./apps/system;
+    overlays = import ./utils/nixFilesIn.nix lib ./overlays;
+    packages = import ./utils/nixFilesIn.nix lib ./packages;
 in {
     imports = nixScripts ++ nixApps ++ [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -286,11 +288,6 @@
 
   nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WebUIDarkMode --force-dark-mode --enable-features=WebRTCPipeWireCapturer"; # --enable-gpu";
 
-  services.mongodb = {
-    package = pkgs.mongodb-5_0;
-    enable = false;
-    dbpath = "/tmp/mongodb";
-  };
 
   fonts = {
     fonts = with pkgs; [
@@ -383,6 +380,14 @@
 #          })];
 #      });
     })
+  ] ++ map (f: import f) overlays ++ [
+    (self: (super: builtins.listToAttrs (
+      map (f: {
+        name = builtins.elemAt (builtins.match "^(.*/)*(.*)\\.nix$" (toString f)) 1;
+        value = super.lib.callPackageWith (self) (import f) {};
+      }) packages
+    )))
+    nurpkgs.overlay
   ];
 
   xdg.mime.defaultApplications = {