Redo module_hook calls to use static obj