diff --git a/docker-compose.yml b/docker-compose.yml
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -284,8 +284,8 @@
     networks: [tngl]
 
   zoekt-webserver:
-    platform: linux/amd64
-    image: ghcr.io/sourcegraph/zoekt:sha-893a523
+    build:
+      context: https://tangled.org/boltless.me/zoekt.git#tngl
     volumes:
       - zoekt-index:/data/index
       - ./localinfra/certs/root.crt:/etc/ssl/certs/caddy.crt:ro
diff --git a/flake.lock b/flake.lock
--- a/flake.lock
+++ b/flake.lock
@@ -37,6 +37,26 @@
         "type": "github"
       }
     },
+    "fetch-tangled": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779479671,
+        "narHash": "sha256-8PR9nZnK0Fn4gDOikz+3sLdsEJYnKC3gaunBs4N+V9Q=",
+        "ref": "refs/heads/main",
+        "rev": "2e3744d31b990248f277d16a11ef81753b366f0f",
+        "revCount": 22,
+        "type": "git",
+        "url": "https://tangled.org/isabelroses.com/fetch-tangled"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://tangled.org/isabelroses.com/fetch-tangled"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -222,6 +242,7 @@
       "inputs": {
         "actor-typeahead-src": "actor-typeahead-src",
         "fenix": "fenix",
+        "fetch-tangled": "fetch-tangled",
         "flake-compat": "flake-compat",
         "gomod2nix": "gomod2nix",
         "htmx-src": "htmx-src",
diff --git a/flake.nix b/flake.nix
--- a/flake.nix
+++ b/flake.nix
@@ -57,6 +57,10 @@
       url = "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip";
       flake = false;
     };
+    fetch-tangled = {
+      url = "git+https://tangled.org/isabelroses.com/fetch-tangled";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -74,11 +78,16 @@
     actor-typeahead-src,
     mermaid-src,
     microvm,
+    fetch-tangled,
     ...
   }: let
     supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
     forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-    nixpkgsFor = forAllSystems (system: nixpkgs.legacyPackages.${system});
+    nixpkgsFor = forAllSystems (system:
+      import nixpkgs {
+        inherit system;
+        overlays = [fetch-tangled.overlays.default];
+      });
 
     mkPackageSet = pkgs:
       pkgs.lib.makeScope pkgs.newScope (self: {
diff --git a/nix/pkgs/zoekt-webserver.nix b/nix/pkgs/zoekt-webserver.nix
--- a/nix/pkgs/zoekt-webserver.nix
+++ b/nix/pkgs/zoekt-webserver.nix
@@ -1,21 +1,20 @@
 {
   lib,
   buildGoModule,
-  fetchFromGitHub,
+  fetchFromTangled,
 }:
 buildGoModule {
   pname = "zoekt-webserver";
   version = "0-unstable-2026-03-25";
 
-  src = fetchFromGitHub {
-    owner = "sourcegraph";
-    repo = "zoekt";
-    rev = "a0f5789d25cb80a36bfb0b85cde2f004880bcbeb";
-    hash = "sha256-y1BskdsrPrIRDFj9n7H6Dl17tS+4epwvShMe/i1I7KA=";
+  src = fetchFromTangled {
+    did = "did:plc:j7br4gn6mwy72wd6skzjhwh5";
+    rev = "cfc4aa0d9ea620143fef099bfed61a88e434c9cd";
+    hash = "sha256-BizF1KGkNecAmc31KuC0rlwLY9dHaYtyohSwTUzX5CE=";
   };
   subPackages = ["cmd/zoekt-webserver"];
 
-  vendorHash = "sha256-WaO8/33pPmGh6tO/poD5epBknZjyzydG9dRuD67dYEw=";
+  vendorHash = "sha256-pWzVhu5nY4e97dHuw5ncLP8YkiYjk0m9l70GYizLNj8=";
 
   doCheck = false;