diff --git a/oni-org/oni-org.el b/oni-org/oni-org.el
index 249298a..8108d77 100644
--- a/oni-org/oni-org.el
+++ b/oni-org/oni-org.el
@@ -153,12 +153,19 @@ _l_: Store link           ^^                         _j_: Journal entry
 (defun oni-org-dblock-write-backlinks (_params)
   "Generate backlinks to org headings."
   (let ((current-heading (nth 4 (org-heading-components)))
+        (current-heading-id (alist-get "CUSTOM_ID" (org-entry-properties) nil nil #'string=))
         backlinks)
     (save-excursion
       (goto-char (point-min))
       (while (re-search-forward (rx-to-string `(and "*" ,current-heading "]")) nil t)
         (unless (oni-org-in-dblock-p)
           (push (nth 4 (org-heading-components)) backlinks))))
+    (when (not (null current-heading-id))
+      (save-excursion
+        (goto-char (point-min))
+        (while (re-search-forward (rx-to-string `(and "#" ,current-heading-id "]")) nil t)
+          (unless (oni-org-in-dblock-p)
+            (push (nth 4 (org-heading-components)) backlinks)))))
     (insert (string-join
              (mapcar (lambda (link)
                        (concat "- [[*" link "][" link "]]"))