diff --git a/oni-cmake.el b/oni-cmake.el
index 714eea0..5524176 100644
--- a/oni-cmake.el
+++ b/oni-cmake.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.220924
+;; Version: 2021.0730.231115
 ;; Package-Requires: (cmake-mode oni-company oni-flycheck oni-lsp cmake-font-lock eldoc-cmake)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -67,7 +67,5 @@ See URL `https://github.com/richq/cmake-lint'"
   (add-to-list 'grep-files-aliases
                '("cmake" . "CMakeLists.txt *.cmake CMakePresets.json CMakeUserPresets.json")))
 
-;;;###autoload(with-eval-after-load 'cmake-mode (require 'oni-cmake))
-
 (provide 'oni-cmake)
 ;;; oni-cmake.el ends here
diff --git a/oni-core.el b/oni-core.el
index 7812706..e8250a6 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0727.210605
+;; Version: 2021.0730.231111
 ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview dashboard)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -254,6 +254,7 @@ _s_: String list"
 (with-eval-after-load 'cider (require 'oni-clojure))
 (with-eval-after-load 'circe (require 'oni-circe))
 (with-eval-after-load 'clojure-mode (require 'oni-clojure))
+(with-eval-after-load 'cmake-mode (require 'oni-cmake))
 (with-eval-after-load 'company (require 'oni-company))
 (with-eval-after-load 'elfeed (require 'oni-elfeed))
 (with-eval-after-load 'embrace (require 'oni-embrace))