diff --git a/modules/base/home.nix b/modules/base/home.nix
index b22430b..f495066 100644
--- a/modules/base/home.nix
+++ b/modules/base/home.nix
@@ -1,5 +1,6 @@
 {
   marleylib,
+  inputs,
   inputs',
   ...
 }: let
@@ -23,7 +24,7 @@ in {
       };
 
       sharedModules = [../home];
-      extraSpecialArgs = {inherit marleylib inputs';};
+      extraSpecialArgs = {inherit marleylib inputs inputs';};
     };
   };
 }
diff --git a/modules/base/programs/neovim.nix b/modules/base/programs/neovim.nix
index 2423f89..bad7726 100644
--- a/modules/base/programs/neovim.nix
+++ b/modules/base/programs/neovim.nix
@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  inputs,
   pkgs,
   ...
 }: let
@@ -9,6 +10,11 @@ in {
   options.marleyos.programs.neovim.enable = lib.mkEnableOption "neovim";
 
   config = lib.mkIf cfg.enable {
+    # Has to be applied on the OS level to use in HM.
+    nixpkgs.overlays = [
+      (import ../../../overlays/marleyvim.nix {inherit inputs;})
+    ];
+
     environment.systemPackages = with pkgs; [
       neovim
     ];
diff --git a/modules/home/programs/neovim.nix b/modules/home/programs/neovim.nix
index 799a0b8..c13d345 100644
--- a/modules/home/programs/neovim.nix
+++ b/modules/home/programs/neovim.nix
@@ -3,7 +3,6 @@
   config,
   osConfig,
   lib,
-  inputs,
   pkgs,
   ...
 }: let
@@ -16,10 +15,6 @@ in {
     mkEnableOption' "neovim" osCfg.enable;
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.overlays = [
-      (import ../../../overlays/marleyvim.nix {inherit inputs;})
-    ];
-
     home.packages = with pkgs; [
       nvim
     ];
diff --git a/modules/home/shell/niri.nix b/modules/home/shell/niri.nix
index 314fcb4..b548669 100644
--- a/modules/home/shell/niri.nix
+++ b/modules/home/shell/niri.nix
@@ -4,7 +4,6 @@
   osConfig,
   lib,
   pkgs,
-  inputs,
   ...
 }: let
   inherit (marleylib.module) mkEnableOption' enabled;
@@ -23,8 +22,6 @@ in {
   };
 
   config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
-    nixpkgs.overlays = [inputs.niri-flake.overlays.niri];
-
     marleyos = {
       shell.wayland = enabled;
       programs = {