diff --git a/flake.lock b/flake.lock
index 6d522ab6..bd500200 100644
--- a/flake.lock
+++ b/flake.lock
@@ -298,24 +298,25 @@
         "type": "github"
       }
     },
-    "patchelf-raphi": {
+    "patchelf": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1661880995,
-        "narHash": "sha256-fJXkByP2QXo/3tpP1mPCYKmGolwlWLxubGV6xdytmCg=",
-        "ref": "refs/heads/replace-symbol",
-        "rev": "9079354d2b94050f38594b5fab5f764f73e4b7e0",
-        "revCount": 676,
-        "type": "git",
-        "url": "https://git.sr.ht/~raphi/patchelf"
+        "lastModified": 1677182397,
+        "narHash": "sha256-vY7ak1viVNb7bGGIrEUblo8ngq8GA5UMo1E7NE6AfUE=",
+        "owner": "nixos",
+        "repo": "patchelf",
+        "rev": "da035d6acee1e5a608aafe5f6572a67609b0198a",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "https://git.sr.ht/~raphi/patchelf"
+        "owner": "nixos",
+        "ref": "da035d6ace",
+        "repo": "patchelf",
+        "type": "github"
       }
     },
     "root": {
@@ -331,7 +332,7 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "ocaml-dns-eio": "ocaml-dns-eio",
         "opam-nix": "opam-nix",
-        "patchelf-raphi": "patchelf-raphi",
+        "patchelf": "patchelf",
         "ryan-cv": "ryan-cv",
         "ryan-website": "ryan-website",
         "twitcher": "twitcher"
diff --git a/flake.nix b/flake.nix
index 25c7b509..f28a2d90 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
     };
     nixos-hardware.url = "github:nixos/nixos-hardware";
     home-manager.url = "github:nix-community/home-manager";
-    patchelf-raphi.url = "git+https://git.sr.ht/~raphi/patchelf";
+    patchelf.url = "github:nixos/patchelf/da035d6ace";
     eeww.url = "github:RyanGibb/eeww/nixos";
     ocaml-dns-eio.url = "github:RyanGibb/ocaml-dns-eio";
 
@@ -42,7 +42,7 @@
       nixpkgs.follows = "nixpkgs";
       flake-utils.follows = "flake-utils";
     };
-    patchelf-raphi.inputs = {
+    patchelf.inputs = {
       nixpkgs.follows = "nixpkgs";
     };
     eeww.inputs = {
@@ -69,7 +69,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, eilean, home-manager, ryan-website, patchelf-raphi, twitcher, nixos-hardware, eeww, ocaml-dns-eio, ... }@inputs: rec {
+  outputs = { self, nixpkgs, nixpkgs-unstable, eilean, home-manager, ryan-website, patchelf, twitcher, nixos-hardware, eeww, ocaml-dns-eio, ... }@inputs: rec {
 
     nixosConfigurations =
       let
@@ -98,9 +98,9 @@
               # `twitcher.nixosModules.default` uses `pkgs.ryan-website`
               "twitcher" = twitcher.packages.${system}.default;
               # can uncomment if want to use patchelf-rafi elsewhere
-              #"patchelf-raphi" = patchelf-raphi.packages.${system}.patchelf;
+              #"patchelf" = patchelf.packages.${system}.patchelf;
               # "cctk" = final.callPackage ./pkgs/cctk/default.nix { };
-              "cctk" = prev.callPackage ./pkgs/cctk/default.nix { patchelf-raphi = patchelf-raphi.packages.${system}.patchelf; };
+              "cctk" = prev.callPackage ./pkgs/cctk/default.nix { patchelf = patchelf.packages.${system}.patchelf; };
               "eeww" = eeww.defaultPackage.${system};
               "ocaml-dns-eio" = ocaml-dns-eio.defaultPackage.${system};
             })
@@ -145,6 +145,6 @@
 
     packages.x86_64-linux.cctk =
       with import nixpkgs { system = "x86_64-linux"; };
-      (pkgs.callPackage ./pkgs/cctk/default.nix { patchelf-raphi = patchelf-raphi.packages.${system}.patchelf; });
+      (pkgs.callPackage ./pkgs/cctk/default.nix { patchelf = patchelf.packages.${system}.patchelf; });
     };
 }
diff --git a/pkgs/cctk/default.nix b/pkgs/cctk/default.nix
index b43a4d79..fa833876 100644
--- a/pkgs/cctk/default.nix
+++ b/pkgs/cctk/default.nix
@@ -4,7 +4,7 @@
   fetchurl,
   dpkg,
   autoPatchelfHook,
-  patchelf-raphi,
+  patchelf,
   openssl_1_1,
 }:
 
@@ -91,9 +91,11 @@ in stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    ${patchelf-raphi}/bin/patchelf \
-      --replace-symbol fopen fopen_wrapper \
-      --replace-symbol access access_wrapper \
+    echo fopen fopen_wrapper > fopen_name_map
+    echo access access_wrapper > access_name_map
+    ${patchelf}/bin/patchelf \
+      --rename-dynamic-symbols fopen_name_map \
+      --rename-dynamic-symbols access_name_map \
       --add-needed ${wrapperLibName} \
       --set-rpath ${lib.makeLibraryPath [ wrapperLib ]} \
       $out/lib/*