diff --git a/flake.nix b/flake.nix
index b9755a4..f1661b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,7 @@
 
         homeManagerModules.default = {
           imports = [
-            (import ./lib/module self.packages)
+            (import ./lib/module self.packages inputs)
           ];
         };
       };
diff --git a/lib/module/default.nix b/lib/module/default.nix
index 025b340..7689aef 100644
--- a/lib/module/default.nix
+++ b/lib/module/default.nix
@@ -1,5 +1,5 @@
 # Home Manager module
-packages: {
+packages: inputs: {
   pkgs,
   config,
   lib ? pkgs.lib,
@@ -8,7 +8,11 @@ packages: {
 }:
 with lib; let
   cfg = config.programs.neovim-flake;
-  set = packages.${pkgs.system}.maximal.override {mainConfig = cfg.settings;};
+  inherit (import ../../extra.nix inputs) neovimConfiguration;
+  set = neovimConfiguration {
+    inherit pkgs;
+    modules = [cfg.settings];
+  };
 in {
   meta.maintainers = [maintainers.notashelf];