Use injected ember within mixin

Some cleanup from the previous PR