diff --git a/init.org b/init.org
index 735d9ca1..9ab89390 100644
--- a/init.org
+++ b/init.org
@@ -894,6 +894,8 @@ Display available keybindings in a popup as you press keys.
  :keymaps 'global
  ;; Editing
  "C-z" 'zap-up-to-char
+ ;; Files
+ "C-x j" 'find-sibling-file
  ;; Region
  "C-x r S" 'sort-lines)
 #+end_src
@@ -3370,9 +3372,8 @@ Add faces to =outline-minor-mode= in order to make the headings stand out.
   :init
   (setq gofmt-command "goimports")
   :config
-  (eval-when-compile (require 'related-files))
-  (with-eval-after-load 'related-files
-    (cl-pushnew '(recipe :remove-suffix ".go" :add-suffix "_test.go") related-files-jumpers :test #'equal)))
+  (cl-pushnew '("\\([^/]+\\)\\.go\\'" "\\1_test.go") find-sibling-rules :test #'equal)
+  (cl-pushnew '("\\([^/]+\\)_test\\.go\\'" "\\1.go") find-sibling-rules :test #'equal))
 #+end_src
 
 *** Packages
@@ -4523,19 +4524,6 @@ Packages that I am currently testing or evaluating.
 (use-package org-roam :ensure t)
 #+end_src
 
-** related-files
-#+begin_src emacs-lisp :tangle yes
-(use-package related-files
-  :ensure t
-  :general
-  ("C-x j" 'related-files-jump
-   "C-x J" 'related-files-make))
-
-(use-package related-files-recipe
-  :demand t
-  :after related-files)
-#+end_src
-
 ** shrface
 #+begin_src emacs-lisp :tangle yes
 (use-package shrface :ensure t)
diff --git a/lock/flake.lock b/lock/flake.lock
index 0fd98e23..9d4fab23 100644
--- a/lock/flake.lock
+++ b/lock/flake.lock
@@ -3088,22 +3088,6 @@
         "type": "github"
       }
     },
-    "related-files": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1679650491,
-        "narHash": "sha256-9HXdnzY02FobwSxn5EfHKN3scIz9g4ATVktKPIu3sQo=",
-        "owner": "DamienCassou",
-        "repo": "related-files",
-        "rev": "f3f841f625a51b964b88cfe08378311124cc5240",
-        "type": "github"
-      },
-      "original": {
-        "owner": "DamienCassou",
-        "repo": "related-files",
-        "type": "github"
-      }
-    },
     "relative-buffers": {
       "flake": false,
       "locked": {
@@ -3347,7 +3331,6 @@
         "redtick": "redtick",
         "reformatter": "reformatter",
         "rego-mode": "rego-mode",
-        "related-files": "related-files",
         "relative-buffers": "relative-buffers",
         "repl-toggle": "repl-toggle",
         "request": "request",
diff --git a/lock/flake.nix b/lock/flake.nix
index 48642c7b..8a0717d8 100644
--- a/lock/flake.nix
+++ b/lock/flake.nix
@@ -1153,12 +1153,6 @@
       repo = "rego-mode";
       type = "github";
     };
-    related-files = {
-      flake = false;
-      owner = "DamienCassou";
-      repo = "related-files";
-      type = "github";
-    };
     relative-buffers = {
       flake = false;
       owner = "terlar";