Don't use ObjectSpace anymore.
Merge pull request #182 from maxigit/57284682_replace_object_space

Don't use ObjectSpace anymore.