diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index 70d5093bb..e39db40a5 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -12,7 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{ pkgs ? import ./nixpkgs-pin.nix
+# This function header aims to provide compatibility between builds of
+# Nixery taking place inside/outside of the TVL depot.
+#
+# In the future, Nixery will transition to using //nix/buildGo for its
+# build system and this will need some major adaptations to support
+# that.
+{ depot ? { nix.readTree.drvTargets = x: x; }
+, pkgs ? import <nixpkgs> {}
 , preLaunch ? ""
 , extraPackages ? []
 , maxLayers ? 20
@@ -27,7 +34,8 @@ let
   # Current Nixery commit - this is used as the Nixery version in
   # builds to distinguish errors between deployed versions, see
   # server/logs.go for details.
-  nixery-commit-hash = args.commitHash or pkgs.lib.commitIdFromGitRepo ./.git;
+  gitDir = if builtins.pathExists ./.git then ./.git else ../../.git;
+  nixery-commit-hash = args.commitHash or pkgs.lib.commitIdFromGitRepo gitDir;
 
   # Go implementation of the Nixery server which implements the
   # container registry interface.
@@ -46,7 +54,7 @@ let
       "-ldflags=-s -w -X main.version=${nixery-commit-hash}"
     ];
   };
-in rec {
+in depot.nix.readTree.drvTargets rec {
   # Implementation of the Nix image building logic
   nixery-prepare-image = import ./prepare-image { inherit pkgs; };
 
diff --git a/tools/nixery/nixpkgs-pin.nix b/tools/nixery/nixpkgs-pin.nix
deleted file mode 100644
index d868855b5..000000000
--- a/tools/nixery/nixpkgs-pin.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import (builtins.fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61.tar.gz";
-  sha256 = "0036sv1sc4ddf8mv8f8j9ifqzl3fhvsbri4z1kppn0f1zk6jv9yi";
-}) {}