diff --git a/default.nix b/default.nix
index 6014f203fc..e98d93fca1 100644
--- a/default.nix
+++ b/default.nix
@@ -12,7 +12,7 @@ let
   pkgs = args.pkgs or (import nixpkgsSrc {});
   flake-compat =
     pkgs.fetchzip {
-      url = "https://github.com/edolstra/flake-compat/archive/${flakeCompatPin.rev}.tar.gz";
+      url = "https://github.com/input-output-hk/flake-compat/archive/${flakeCompatPin.rev}.tar.gz";
       sha256 = flakeCompatPin.narHash;
     };
   self = import flake-compat {
diff --git a/flake.lock b/flake.lock
index 373ff59a86..c2fb2c3e8c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -86,16 +86,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1632802058,
-        "narHash": "sha256-7IySNHriQjzOZ88DDk6VDPf1GoUaOrOeUdukY62o52o=",
-        "owner": "hamishmack",
+        "lastModified": 1635892615,
+        "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=",
+        "owner": "input-output-hk",
         "repo": "flake-compat",
-        "rev": "5523c47f13259b981c49b26e28499724a5125fd8",
+        "rev": "eca47d3377946315596da653862d341ee5341318",
         "type": "github"
       },
       "original": {
-        "owner": "hamishmack",
-        "ref": "hkm/pkgs-fetch",
+        "owner": "input-output-hk",
         "repo": "flake-compat",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 3de256247b..e6b97a22cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
     nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };
     nixpkgs-2205 = { url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin"; };
     nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
-    flake-compat = { url = "github:hamishmack/flake-compat/hkm/pkgs-fetch"; flake = false; };
+    flake-compat = { url = "github:input-output-hk/flake-compat"; flake = false; };
     flake-utils = { url = "github:numtide/flake-utils"; };
     hydra.url = "hydra";
     hackage = {
diff --git a/shell.nix b/shell.nix
index c22e7e63c8..02c9c0fd28 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1 +1 @@
-(import ./default.nix {}).devShell.${builtins.currentSystem}
+(import ./default.nix {}).devShells.${builtins.currentSystem}