diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index d38ee24..cecfbd2 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -46,15 +46,23 @@
 (require 'package)
 
 (eval-and-compile
-  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/")))
-
-(eval-and-compile
-  (add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/")))
-
-(eval-and-compile (package-initialize))
+  ;; Add MELPA because it's the biggest package repository for Emacs.
+  (add-to-list 'package-archives
+               '("melpa" . "https://melpa.org/packages/"))
+  ;; Add the Org package archive to be able to install the bleeding
+  ;; edge Org mode.
+  (add-to-list 'package-archives
+               '("org" . "http://orgmode.org/elpa/"))
+  ;; Add my personal package archive so I can upload custom libraries
+  ;; and stuff there.
+  (add-to-list 'package-archives
+               '("oni" . "https://ryuslash.org/elpa/"))
+  (package-initialize))
 
 (add-hook 'package-menu-mode-hook 'hl-line-mode)
 
+(with-eval-after-load 'package (require 'oni-package-x))
+
 ;;;; Dependencies
 
 (require 'counsel)