replace ModuleStore.get with System.get

I tried this out to see if I could fix the issues, but didn't get any tests breaking.

If you let me know what's not working I'd be happy to assist looking into it.