diff --git a/default.nix b/default.nix
index dbbfb5d1..6089274d 100644
--- a/default.nix
+++ b/default.nix
@@ -5,7 +5,7 @@
   fetchTarball {
     url =
       lock.nodes.flake-compat.locked.url
-        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+        or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
     sha256 = lock.nodes.flake-compat.locked.narHash;
   }
 ) { src = ./.; }).defaultNix
diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock
index 769d4f42..ab40899f 100644
--- a/flake/dev/flake.lock
+++ b/flake/dev/flake.lock
@@ -40,13 +40,13 @@
       "locked": {
         "lastModified": 1752326326,
         "narHash": "sha256-JtdaTv+1VIiZpLsULCSQte6Qg3ew5axbdpOYjo+8D2U=",
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "rev": "b70558fcb45e248abd2a0add41cfb6464c94eb03",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "ref": "pull/75/merge",
         "repo": "flake-compat",
         "type": "github"
diff --git a/flake/dev/flake.nix b/flake/dev/flake.nix
index dfd0951d..56fdf5c9 100644
--- a/flake/dev/flake.nix
+++ b/flake/dev/flake.nix
@@ -10,7 +10,7 @@
     # flake-compat is used by the root `default.nix` to allow non-flake users to import nixvim
     #
     # The pinned PR resolves an issue with shallow clones, such as those used by CI.
-    flake-compat.url = "github:edolstra/flake-compat?ref=pull/75/merge";
+    flake-compat.url = "github:NixOS/flake-compat?ref=pull/75/merge";
 
     # keep-sorted start block=yes newline_separated=yes
     devshell = {
diff --git a/tests/no-flake.nix b/tests/no-flake.nix
index ed7b6a88..85240d3b 100644
--- a/tests/no-flake.nix
+++ b/tests/no-flake.nix
@@ -14,7 +14,7 @@ let
       fetchTarball {
         url =
           lock.nodes.flake-compat.locked.url
-            or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+            or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
         sha256 = lock.nodes.flake-compat.locked.narHash;
       }
     ) { src = nixvim; }).defaultNix;