diff --git a/modules/plugins/utility/surround/surround.nix b/modules/plugins/utility/surround/surround.nix
index d74966af..96ff5efb 100644
--- a/modules/plugins/utility/surround/surround.nix
+++ b/modules/plugins/utility/surround/surround.nix
@@ -38,7 +38,7 @@ in {
       default = false;
       description = ''
         nvim-surround: add/change/delete surrounding delimiter pairs with ease.
-        Note that the default mappings deviate from upstreeam to avoid conflicts
+        Note that the default mappings deviate from upstream to avoid conflicts
         with nvim-leap.
       '';
     };
diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix
index 64734f3b..1f14b3a6 100644
--- a/modules/wrapper/build/config.nix
+++ b/modules/wrapper/build/config.nix
@@ -59,7 +59,7 @@
         "flutter-tools.dev_tools"
       ];
     };
-    inherit (pkgs) blink-cmp;
+    inherit (inputs.self.legacyPackages.${pkgs.stdenv.system}) blink-cmp;
   };
 
   buildConfigPlugins = plugins: