Switch to custom use-package macro