switch to using our instead of pkg, yay