diff --git a/flake.nix b/flake.nix
index c95032cd..88d8d030 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,7 +40,7 @@
         configuration:
         let
           eval = evalModules {
-            modules = modules pkgs ++ [ configuration ];
+            modules = modules pkgs ++ [{ config = configuration; }];
           };
         in
         eval.config.output;
@@ -76,7 +76,6 @@
     in
     flakeOutput // {
       inherit build;
-      # TODO: Stuff for home-manager and nixos modules backwards compat, keeping the architecture as x86_64 if none is specified...
       homeManagerModules.nixvim = flakeOutput.homeManagerModules.x86_64-linux.nixvim;
       nixosModules.nixvim = flakeOutput.nixosModules.x86_64-linux.nixvim;
     };
diff --git a/tests/flake.lock b/tests/flake.lock
index 50512689..a5c930b8 100644
--- a/tests/flake.lock
+++ b/tests/flake.lock
@@ -66,12 +66,12 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-TGzzj1r1lqxquirvC3yzhuh2fYamEjWIrKG1RMtwsSA=",
-        "path": "/nix/store/pql62xd29lxl70icdqc97qiarqkalwga-source",
+        "narHash": "sha256-KhmkkdmESupzYbpjQn09UE96/SuVcdzrKTt8R1FQymA=",
+        "path": "/nix/store/l2s5vhqf3w74203w3a0ydvpg5vw1kvvl-source",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/pql62xd29lxl70icdqc97qiarqkalwga-source",
+        "path": "/nix/store/l2s5vhqf3w74203w3a0ydvpg5vw1kvvl-source",
         "type": "path"
       }
     },
diff --git a/tests/flake.nix b/tests/flake.nix
index f2d03dce..ee8ea166 100644
--- a/tests/flake.nix
+++ b/tests/flake.nix
@@ -44,6 +44,64 @@
                 nixGrammars = false;
               };
             };
+
+            issue-40 = build {
+              plugins = {
+                nix.enable = true;
+                nvim-autopairs.enable = true;
+
+                lualine = {
+                  enable = true;
+
+                  sectionSeparators = {
+                    left = "";
+                    right = "";
+                  };
+
+                  componentSeparators = {
+                    left = "";
+                    right = "";
+                  };
+
+                  theme = "auto";
+                };
+
+                goyo = {
+                  enable = true;
+                  showLineNumbers = false;
+                };
+
+                lsp = {
+                  enable = true;
+                  servers = {
+                    rust-analyzer.enable = true;
+                    rnix-lsp.enable = true;
+                  };
+                };
+
+              };
+
+              options = {
+                # Indentation
+                autoindent = true;
+                tabstop = 4;
+                shiftwidth = 4;
+                expandtab = true;
+                backspace = "indent,eol,start";
+
+                # Text
+                showmatch = true;
+                mouse = "a";
+                number = true;
+                relativenumber = false;
+                ttyfast = true;
+                clipboard = "unnamedplus";
+
+                # Colors
+                background = "dark";
+                termguicolors = true;
+              };
+            };
           };
         })) // {
       nixosConfigurations.nixvim-machine = nixpkgs.lib.nixosSystem {