Fix object lookup