             module (car module-pair)
             submodule (cdr module-pair))))
   (if flag
-      (and (memq flag (doom-module-flags module submodule)) t)
-    (doom-module-loaded-p module submodule)))
+      (and (memq flag (doom-module-get module submodule)) t)
+    (doom-module-enabled-p module submodule)))
 
 
 ;;

           if (file-exists-p path)
           collect path))

(defun doom-module-flags (module submodule)
  "Returns a list of flags provided for MODULE SUBMODULE."
  (and (hash-table-p doom-modules)
       (gethash (cons module submodule) doom-modules)))

(defun doom-module-loaded-p (module submodule)
  "Returns t if MODULE->SUBMODULE is present in `doom-modules'."
  (and (doom-module-flags module submodule) t))

(defun doom-module-enable (module submodule &optional flags)
  "Adds MODULE and SUBMODULE to `doom-modules', overwriting it if it exists.

       ,@(cl-loop for (module . submodule) in (doom-module-pairs)
                  for module-path = (doom-module-path module submodule)
                  collect `(load! init ,module-path t) into inits
                  collect `(load! config ,module-path t) into configs
                  finally return (append inits configs))

       (when (display-graphic-p)
