diff --git a/flake.nix b/flake.nix
index 38d73dcc..089d3d9a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,39 +54,47 @@
     inherit (gitignore.lib) gitignoreSource;
   in {
     overlays.default = final: prev: let
-      goModHash = "sha256-PJd2UvQJ7HVp2+s+QZPwL2FcdbSsRDxQZHV9hGotB2Y=";
+      goModHash = "sha256-G+59ZwQwBbnO9ZjAB5zMEmWZbeG4k7ko/lPz+ceqYKs=";
       appviewDeps = {
         inherit htmx-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource;
       };
       knotDeps = {
         inherit goModHash gitignoreSource;
       };
-    in {
-      lexgen = final.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;};
-      appview = final.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps;
-      appview-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/appview.nix appviewDeps;
-      knot = final.pkgsStatic.callPackage ./nix/pkgs/knot.nix {};
-      knot-unwrapped = final.pkgsStatic.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps;
-      knot-cross = final.pkgsCross.gnu64.pkgsStatic.callPackage ./nix/pkgs/knot.nix knotDeps;
-      sqlite-lib = final.pkgsStatic.callPackage ./nix/pkgs/sqlite-lib.nix {
-        inherit (final.pkgsStatic) gcc;
-        inherit sqlite-lib-src;
+      mkPackageSet = pkgs: {
+        lexgen = pkgs.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;};
+        appview = pkgs.callPackage ./nix/pkgs/appview.nix appviewDeps;
+        knot = pkgs.callPackage ./nix/pkgs/knot.nix {};
+        knot-unwrapped = pkgs.callPackage ./nix/pkgs/knot-unwrapped.nix knotDeps;
+        sqlite-lib = pkgs.callPackage ./nix/pkgs/sqlite-lib.nix {
+          inherit (pkgs) gcc;
+          inherit sqlite-lib-src;
+        };
+        genjwks = pkgs.callPackage ./nix/pkgs/genjwks.nix {inherit goModHash gitignoreSource;};
       };
-      genjwks = final.callPackage ./nix/pkgs/genjwks.nix {inherit goModHash gitignoreSource;};
-    };
+    in
+      mkPackageSet final;
+
+    packages = forAllSystems (system: let
+      pkgs = nixpkgsFor.${system};
+      staticPkgs = pkgs.pkgsStatic;
+      crossPkgs = pkgs.pkgsCross.gnu64.pkgsStatic;
+    in {
+      appview = pkgs.appview;
+      lexgen = pkgs.lexgen;
+      knot = pkgs.knot;
+      knot-unwrapped = pkgs.knot-unwrapped;
+      genjwks = pkgs.genjwks;
+      sqlite-lib = pkgs.sqlite-lib;
+
+      pkgsStatic-appview = staticPkgs.appview;
+      pkgsStatic-knot = staticPkgs.knot;
+      pkgsStatic-knot-unwrapped = staticPkgs.knot-unwrapped;
+      pkgsStatic-sqlite-lib = staticPkgs.sqlite-lib;
 
-    packages = forAllSystems (system: {
-      inherit
-        (nixpkgsFor."${system}")
-        lexgen
-        appview
-        appview-cross
-        knot
-        knot-cross
-        knot-unwrapped
-        genjwks
-        sqlite-lib
-        ;
+      pkgsCross-gnu64-pkgsStatic-appview = crossPkgs.appview;
+      pkgsCross-gnu64-pkgsStatic-knot = crossPkgs.knot;
+      pkgsCross-gnu64-pkgsStatic-knot-unwrapped = crossPkgs.knot-unwrapped;
     });
     defaultPackage = forAllSystems (system: nixpkgsFor.${system}.appview);
     formatter = forAllSystems (system: nixpkgsFor."${system}".alejandra);
diff --git a/go.mod b/go.mod
index d2dd60d3..02803847 100644
--- a/go.mod
+++ b/go.mod
@@ -38,7 +38,6 @@ require (
 	github.com/yuin/goldmark v1.4.13
 	golang.org/x/crypto v0.38.0
 	golang.org/x/net v0.40.0
-	golang.org/x/sync v0.14.0
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
 	gopkg.in/yaml.v3 v3.0.1
 	tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250526154904-3906c5336421
@@ -144,6 +143,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/time v0.8.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
diff --git a/nix/pkgs/genjwks.nix b/nix/pkgs/genjwks.nix
index 6af8d4a9..087faddc 100644
--- a/nix/pkgs/genjwks.nix
+++ b/nix/pkgs/genjwks.nix
@@ -9,5 +9,6 @@ buildGoModule {
   src = gitignoreSource ../..;
   subPackages = ["cmd/genjwks"];
   vendorHash = goModHash;
+  doCheck = false;
   env.CGO_ENABLED = 0;
 }