We address the issue of maximizing the number of connected devices in a Narrowband Internet of Things (NB-IoT) network using non-orthogonal multiple access (NOMA). The scheduling assignment is done on a per-transmit time interval (TTI) basis and focuses on efficient device clustering. We formulate the problem as a combinatorial optimization problem and solve it under interference, rate and sub-carrier availability constraints. We first present the bottom-up power filling algorithm (BU), which solves the problem given that each device can only be allocated contiguous sub-carriers. Then, we propose the item clustering heuristic (IC) which tackles the more general problem of non-contiguous allocation. The novelty of our optimization framework is twofold. First, it allows any number of devices to be multiplexed per sub-carrier, which is based on the successive interference cancellation (SIC) capabilities of the network. Secondly, whereas most existing works only consider contiguous sub-carrier allocation, we also study the performance of allocating non-contiguous sub-carriers to each device. We show through extensive simulations that non-contiguous allocation through IC scheme can outperform BU and other existing contiguous allocation methods.