Fix object monkey patch

I'm not 100% in love with this solution, but it does get rid of the object monkey patch without a lot of other changes. Feedback is welcome.