diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..e7f4341a7
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,10 @@
+# -*- mode: conf -*-
+# Each line is a file pattern followed by one or more owners.
+
+# I will be the default owner for everything in the repo unless a later match
+# takes precedence.
+*  @hlissner
+
+# Module maintainers
+modules/app/everywhere/*     @hlissner @tecosaur
+modules/input/layout/*       @hlissner @gagbo
diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index 7e460826f..2bd497e45 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -85,7 +85,8 @@ If no project is active, return all buffers."
 ;;;###autoload
 (defun doom-dired-buffer-p (buf)
   "Returns non-nil if BUF is a dired buffer."
-  (with-current-buffer buf (derived-mode-p 'dired-mode)))
+  (provided-mode-derived-p (buffer-local-value 'major-mode buf)
+                           'dired-mode))
 
 ;;;###autoload
 (defun doom-special-buffer-p (buf)
@@ -162,8 +163,9 @@ If DERIVED-P, test with `derived-mode-p', otherwise use `eq'."
   (let ((modes (doom-enlist modes)))
     (cl-remove-if-not (if derived-p
                           (lambda (buf)
-                            (with-current-buffer buf
-                              (apply #'derived-mode-p modes)))
+                            (apply #'provided-mode-derived-p
+                                   (buffer-local-value 'major-mode buf)
+                                   modes))
                         (lambda (buf)
                           (memq (buffer-local-value 'major-mode buf) modes)))
                       (or buffer-list (doom-buffer-list)))))