diff --git a/configuration/common/pkg/neovim.nix b/configuration/common/pkg/neovim.nix
index d9e80a1..b5c76b2 100644
--- a/configuration/common/pkg/neovim.nix
+++ b/configuration/common/pkg/neovim.nix
@@ -4,7 +4,7 @@ let
   commonPkgs = with pkgs; [
     xsel
   ];
-  goPkgs = with gitpkgs.go16Packages; [
+  goPkgs = with pkgs.go16Packages; [
     go
     tools.bin
     godef.bin
diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix
index d608b3d..7b80910 100644
--- a/configuration/steveej-laptop/pkg.nix
+++ b/configuration/steveej-laptop/pkg.nix
@@ -10,7 +10,7 @@ in
     allowBroken = false;
 
     packageOverrides = pkgs: rec {
-      goPackages = pkgs.go16Packages;
+      goPackages = gitpkgs.go16Packages;
       bluez = pkgs.bluez5;
       linuxPackages = pkgs.linuxPackages_latest;
       #pythonPackages.sqlalchemy7 = pkgs.pythonPackages.sqlalchemy7.override { doCheck = false; };
diff --git a/derivations/dev/go.nix b/derivations/dev/go.nix
index e992c73..c8ffb27 100644
--- a/derivations/dev/go.nix
+++ b/derivations/dev/go.nix
@@ -1,5 +1,5 @@
 {
-pkgs ? import /home/steveej/src/github/NixOS/nixpkgs-systemsource {},
+pkgs ? import /home/steveej/src/github/NixOS/nixpkgs {},
 name ? "generic",
 version,
 extraBuildInputs ? [] }: